gh-143921: Reject control characters in IMAP commands

Origin: upstream, https://github.com/python/cpython/commit/6262704b134db2a4ba12e85ecfbd968534f28b45

Gbp-Pq: Name CVE-2025-15366.patch

diff --git a/Lib/imaplib.py b/Lib/imaplib.py
index d9720f20c390256322cc207bf89fb4981dd0b218..3eff3147a7894594cccc7455d27a03dd9df5d821 100644 (file)
--- a/Lib/imaplib.py
+++ b/Lib/imaplib.py
@@ -129,7 +129,7 @@ Untagged_status = re.compile(
 # We compile these in _mode_xxx.
 _Literal = br'.*{(?P<size>\d+)}$'
 _Untagged_status = br'\* (?P<data>\d+) (?P<type>[A-Z-]+)( (?P<data2>.*))?'
-
+_control_chars = re.compile(b'[\x00-\x1F\x7F]')
 
 
 class IMAP4:
@@ -985,6 +985,8 @@ class IMAP4:
             if arg is None: continue
             if isinstance(arg, str):
                 arg = bytes(arg, self._encoding)
+            if _control_chars.search(arg):
+                raise ValueError("Control characters not allowed in commands")
             data = data + b' ' + arg
 
         literal = self.literal

diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py
index 914a75a6adabf46cdea436aa811041876b6baf35..fc918af281bfc0ed389ff5c5a47b061269fca320 100644 (file)
--- a/Lib/test/test_imaplib.py
+++ b/Lib/test/test_imaplib.py
@@ -536,6 +536,12 @@ class NewIMAPTestsMixin():
         self.assertEqual(data[0], b'Returned to authenticated state. (Success)')
         self.assertEqual(client.state, 'AUTH')
 
+    def test_control_characters(self):
+        client, _ = self._setup(SimpleIMAPHandler)
+        for c0 in support.control_characters_c0():
+            with self.assertRaises(ValueError):
+                client.login(f'user{c0}', 'pass')
+
 
 class NewIMAPTests(NewIMAPTestsMixin, unittest.TestCase):
     imap_class = imaplib.IMAP4

diff --git a/Misc/NEWS.d/next/Security/2026-01-16-11-41-06.gh-issue-143921.AeCOor.rst b/Misc/NEWS.d/next/Security/2026-01-16-11-41-06.gh-issue-143921.AeCOor.rst
new file mode 100644 (file)
index 0000000..4e13fe9
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2026-01-16-11-41-06.gh-issue-143921.AeCOor.rst
@@ -0,0 +1 @@
+Reject control characters in IMAP commands.